From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 10 Dec 2012 08:47:32 +0000 (-0500)
Subject: popupMenu: Display the proper animations for popup menus
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5263
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ca2ee22827eb283c76c6a6e2c4f5e15098ae2ff1;p=gnome-shell.git

popupMenu: Display the proper animations for popup menus

BoxPointer's API changed to take a BoxPointer.PopupAnimation
enumeration value, but the code was accidentally replaced with
older code when porting the PopupMenuManager code to GrabHelper.

https://bugzilla.gnome.org/show_bug.cgi?id=689954
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 85acb70b2..202ae3d35 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -2133,11 +2133,12 @@ const PopupMenuManager = new Lang.Class({
     },
 
     _changeMenu: function(newMenu) {
-        if (this.activeMenu) {
-            this._closeMenu(this.activeMenu);
-            newMenu.open(false);
+        let oldMenu = this.activeMenu;
+        if (oldMenu) {
+            oldMenu.close(BoxPointer.PopupAnimation.FADE);
+            newMenu.open(BoxPointer.PopupAnimation.FADE);
         } else {
-            newMenu.open(true);
+            newMenu.open(BoxPointer.PopupAnimation.FULL);
         }
     },